[Develop] Minor fixes