Bugfixes for indirect protos