Updates,fixes from master.