Two directories, minor fixes