[Pani] Minor changes based on Ravis feedback