Yet more docblock fixes