Console sample improvements.