Logical fixes/tweaks