- Minor bugfixes