Update fixes from old repo