additional fixes.