builder, engine fixes for R and friends