Things required to make the latest build stable