Added keep awake request for measurements, small fixes