Post Class minor fixes