Surya fixes