-Minor bugfixes