minor bugfixes #2