Fix: more bugs