Some small tweaks/fixes.