[Jackie] Misc updates