Fix some outputs