Fixed loader bugs