Fix findbugs and file ending