Some bugfixes ....