Minor changes #3