Bluepill housekeeping [#62982056]