Minor refinments