Fixes to support Apps1 issue #1.