Additional fixes on top of these two - missing inline assembly constraint - wrong exception handling are necessary