Fixes for deployements