More bug fixes.