[SRP] fix/improve log issues