Ported customisations over from customised QuincyKit