FewBug fixes