Some more small app initialisation updates