Round of fixes after class.