Fix findbugs warnings
Enable findbugs errors and clean up