Bug fixes from Laura review