A few changes for 4.3