Load optimisations and miscellaneous fixes