A couple of additional fixes...