Fix issues I caused on Control/Section mapping