Minor bugfixes :)