Fix problems with Interface More

Change-Id: Ieef43a142b41579e11e70a25995b9802abd62a23