SDK 2.4 and bugfixes