Further bug fixes.