Clean up const warnings