Some minor fixes for constness