and 26. Fixed issues after SDK update