More related bug fixes.