Fix bugs with interface