[es] Cases 33 and 34 (and small corrections to 28 and 30)