Fix annotations
Fix documentation warnings