Do minor changes