Several updates based on Mark CR.