Cleaning up
Protocol buffer fixes