Even more fixes, the generate excpetion notice is broken but everything else works ok