short bugfixes