initial fixes for master classes