Fixes for day 4