Added changes from recent fixes.