Fixed a few things before push to prod