[Pani] Minor changes