few minor bugfixes