Fix: Minor changes