a couple more fixes for the changes in interfaces

Change-Id: I22ed9a51a11c605f164901e8276071d225de636f