Fixes from feedback of sprint 2