[bug] Minor changes