Minor additional fixes.