Build fixes for latest SDK release. Buddy: Salva