Minor bug fixes when deploying