Bugfixes
More bugfix