Fixes
Output changes