Minor Changes for production deploy