Gnat checkstyled and a couple other minor checks