Improved logging and conditional aerosol fixing