Fixed buildLogs

@bparees FYI
We all agreed on IRC to live this as is in this PR, and I'll work on switching builds and wherever possible to watches in a separate PR.