Fixes after dataset interface change