[2.0] Bunch of fixes and enhancements