[Restructure] Misc corrections