Find bugs bug fixes