Various fixes/tweaks