Fix data outputs