Fixed endless recursion, and findbugs errors