More production/dev fixes

(cherry picked from commit 7deed40171856a67b8b04fcc073672809f348700)