Mikes opacity fixes. Concurrent fix to both branches.