Some yeoman fixes