Fixing final pieces of controls.