As always, fix issues identified on production