Fix Problems from merge found in Sprint Review