Misc updates and minor tweaks