Minor corrections / improvements.