Merge "Fix Loader bugs"