Code: Minor improvements.