Fixes for auto deploy