Fix docblock grabbing issues