[Misc] Minor improvements