Fix event order firing. Update all other wrappers for changes to ProtoWrapper