Fix: some more docblocks to help the static analyser