Some changes. Disable server consistency fix for tomorrows presentation