Try to make doze work better

Try all alternatives until something works.