Fixes merged from master.