subdirectory fixes