tweaks to try and get the loading order correct