Yet more bug fixes, weaker mutation