Fixed some problems by Kvetko N.N.