Minor fixes; update for new cBorder