Fixed minor issues in uncontrolled