More fixes from Niki