Code cleanup
Fix an update bug which occurs when using a dev..

...build