Fix up some bugs with the overlay controls implementation