Small fixes/tweaks.