Push some edits for versioning with goxc