Interface Bug Fixes