Const fixes for gcc on osx