Fixed warnings, updated generators