WD-specific fixes made. Note that some of these won't show up until we
actually switch over to WD.