Fix up a few interface things