Minor changes fixing warnings and bad output formatting