logging issues fixed