Initial fix for gate actor ids