Fixed bugs with partner interface.