Various docblock fixes