Updating some mutable proto stuff and fixing a bug or two.