Adaptions for latest API changes in Scout SDK (M6 compatibility)