Tweaks for compat and compile

Change-Id: I48cec0618bc611a3051cbcdb2e261d965d68754f