Update fixes from meeting