Fixes for Surya