Some misc tweaks