Code generation now works with latest master