Some bug fixes in interface