Fixed loader bugs.