Porting a couple of community complex command fixes