Fix a couple issues and cleanup scripts a bit