[WIP] Fixing jenkins failures