Stupid hacky fixes to get this working on our host