Documentation & monitors: Fixes for optional fields