fixes after merges from 0.1x.xx