Fixed kola based issues