More fixes - Final fix*