Minor changes to align with what is deployed to prod

Minor changes to align with what is deployed to prod