Bug- and other fixes