Fix: more review fixes