Some fixes to anonymous loading