P3K some more fixes in random places