More 1.21 compat

Change-Id: Ifa2351da995631e4f1751ed97cad9bb28b6ab0ff