Fix autogen violations