Fix printouts to be more accurate