Fixes - round 10