Fixed bugs in loader & updater