Const fixes