Hometask 5 fixes