Back to 'CD' in a couple of places