Fix: Some quality fixes