Fixes for App1, Sec 4.1