Minor updates to loader module.