Small tweaks/bugfixes as usual