Flow fixes