Small changes to match documentation.