fix problems arising from manual 0.2.5 merge