Making last evecomframework fixes