Fixing some const issues.