Made some const variables non-const.