FIXED: small issues for running on the ATLAS cluster