some fixes for automatic deployment