Fix a few small issues and update package names