/barf cmd fixes