fixes for modifier parsing