Fixed some more potential bugs using findbugz and codepro