fix couple logging issues