Quick fixes for 1.88 SDK