Multiple fixes for Loader and Class