Miscellaneous controls cleanups