Furth attempts at on load fixes