Cleaned up some changesets that were susceptible to fail