Last tweaks to make sure everything is updating properly from developer version