added some const casts