Cleaning up some version control issues