Prevent upgrade issues