Fixes and workarounds before testing