last fixes for deployment