Log warnings
Minor change + more time to timeout sensitive test
Merge branch 'log-warnings'