Fixes - round 7