fix - some bugs found by Findbugs