Keeping initD inline with new switches