Added patch to main build, for ease