Yet more bug fixes.