Some general fixes on master.