Add more 3.0.8 improvements