Fixed some collateral damage of earlier changes