A few more changes to deal with overlapping Eclipse build requests