Updates to bring in line with sensible expectations and the latest documentation.