fixes for new interface