Fix constness