final preproduction fixes