Right on both counts. Will fix.