Fix: minor fixes