minor bugfixes
minor bugfixes