Cleaning up warnings
Fixed bug where we did not exit the default case properly.
Updated CONTROL_DEFAULTX_XXXX to new unified format for all platforms