master: small changes