#2 could just be a master fix, but it doesn't hurt anything to put it on f18-beta-branch as well. The other three fix bugs which perhaps do not block beta yet, but should. - Chris