Fixed a few interface bugs