build fixes for SDK 2.7