Clean up more notices
Only log on debug