Fixed a couple interface change failures