Uncommitted fixes from server