Some really small additional fixes.