Minor updates from Mark