Fixes for App1, Sec 3