Some minor beauty fixes