Minor fixes with output