Fixups

Fixup force rebuild in a loop which crashes sometimes.

Also support ruby 1.9.3: String#grep is removed.