more busy loop fixes