More misc tweaks