Fix build & deploy