Minor bugfixen