Some docblock related changes