Added some conformance changes because of the GUI.