couple of quick bugfixes