Bugfixes 4

More minor bugfixes