Fixed a few issues with deployment