const fixes