More global fixes.