Fix: Various updates