This PR fixes some hard coded paths and merges in changes from Admire