Fix bugs related to Genkin