Fix: Common fixes