fixed issues caused by (my) dodgy merges last night