* Compatibility improvements
* Minor changes 
