Fix to allow closure compile pass

Minor fixes to allow closure compile