Fixed consts and outputs