And yet more bug fixes.