Fixes for incomplete dictums and procedures