Synchronized with latest fixes