Fix: few fixes