Some small tweaks/bugfixes as usual