Some tweaks on the interface.