Fixes to including classes