Fixed const errors