Fixing some bugs on the update system