Fix autogeneration errors