fixes after drebs review (to be squashed)