Some minor tweaks to improve/fix little things