Whoop fixes