Fixed bugs found by findbugs
Fix for version in deployed artifact