Correct subdirectory problems