Update fixes and opts