Fixed constness issues.