Minor changes #5