More interface related fixes