More const fixes