Adjustments to constructor use