Various path fixes