Before deployment, last fixes