Fix: Various fixes