Fixes for CH6
Fixes for App