Fixes from master.