Fixing up some interface stuff