Small updates and tweaks