Bugfixes and small adjustments