Fixes from practice