Fixes for printing values