Apply Metaswitch fixes to date