Fixes for Karan