Fixing bugs on manual update