Control fixes