Fixed a few things for deployment