Fixed basic loader functions