Bugfixes:
More bug fixes