Fixing base paths