another part of find bugs fixes