More misc. fixes and tweaks