More fixes to be squashed