Last minute hacks to work around production quirks