More interface signature fixes.