Fixes for output