FIX: Fixing no-directory and no-var bugs