update-related fixes