Fix: more more bugs