Minor changes / improvements.