Fixes for outputs