clean up more const problems