Adapted elements to the recent platform changes