Small fixes/tweaks