Fix warnings in barebones runs

Another trivial change set; barebones regressions are fixed.