SDK update fixes