Auto update more fixes