More fixes from practice