Super Classes: Fix build errors