More suit fixes