Preproduction fixes