Small fixes during deployment