SDK-328: Fix build problems