Minor fixes for new flow