Fixes for generator version ~0.17.0