Fixed 2.3 update related issues