Doc inspired fixes