Various fixes/changes with creating interface