More fixes from dev