Fixed assorted mule issues