Improve haveged patch