Minor improvements...