Fixing more base path issues