Fix package path weirdness