Interface changes + misc fixes