Fix some spec breakage introduced by new non-matching attributes on commands