Do minor fixes