class & assertion fixes