Various minor changes
Package updates and tweaks