Fixed some issues related to the interface.