Fixed up some more commands/attributes