Minor bugfix
More minor bugfixes