Tidy up and fix path resolution for deploy