Some  bugfixes :)