Fix: Minor fixes