Minor changes #2