Interface: minor fixes and optimizations