some fixes for "optional" step