Cleanup
Address some pet loading issues