Add more docblock fixes