Fixed FindBugs issues
Removed Eclipse warnings