Import 10.15.1 compatibility fixes · acidanthera/WhateverGreen@f5c4211