guidance fixes