Loading changes, fixes for Triptych