Tidying up some guidance quirks