Quick bugfixes