Lab 3 - Applied fixes from Fixes task sheet