Fixed control bugs.