Fix: more bugs bugs bugs