Small fixes for Loader