Issue 516: Excluded some files