Fixes to C000556.yaml bug #430