Fixed generated class routine builders