Better (more stable) guessing of RB versions, and minor semantic fixes.