Fix findbugs warnings
Fix maven warnings