Fix invalid warnings/errors about notes fields