A whole bunch of miscellaneous interface fixes