Fix some const-related warnings