Small Design and Flow fixes