Quarantine fixes