Some small production changes