Fix generate calls