Some load fixes