Some fixes/tweaks