sweep2wake: Fixup merge mistakes to fix compiling