More fixes from Krista