fix issues noticed on prod deploy

@hkal !