More stupid path fixes