Merged
More fixes post merge
Cut back on customisations