Good catches! Fixed.