Some fixes for sweep2wake