More const in edsam functions