Fixes for loading other classes