Minor changes to improve messages