Fixes as per 26 jan