Fix everything for 4.3