More fixes for 4.5 support.