Some more prithvi updates