One step closer to InMemory analytics and fixes local mode