Fix limitControl issues