Better tweaks for forward compatibility

Change-Id: I093e7a32dad529023f761b735eefbd1db6b1fca0
tweaks for forward compatibility

Change-Id: Id9089424d82567556fc1faf6024cfe46b3de7cfe