Updates for better 4.5 support.