Fix mixinDirs vs. mixinSources, minor touchups