Small bug fixes - can't get through the flow yet however