Several small fixes for interface