Fixed weird update issues