[Misc] minor fixes