Fixes for the loader