Cloning fixes, initial protocol check-in.