Minor changes (& to and), so it builds