Fixes (generator, interface, etc)