Stephen Kick's interface fixes
3 files changed