Fixes for firmware/SDK 2.5