More production/dev fixes