changes to support org customizations and other fixes