fixes from Prabhas