Small cleanups + package updates