Minor fixes and new LocPerSourceFile metric