Update bugs fixing