#360: Minor changes