[Misc] Misc changes