Fix: few bugs