Added latest fixes