More bugfixes
More bugfixes