Remove unnecessary error recovery for fatal errors
Fix demo build
Change minimum Java version to 7 #1633