More fixes from testing