Added fixes for SLO