fixes to load