Stability fixes for advanced deployment and Dashboard