Compatibility changes to merge into Eli's uber.

Signed-off-by: Victoria <kitsuta@gmail.com>