small changes inside SDK