More picky fixes