Fix some CommandService FIXMEs