Small collection of bugfixes