A couple adjustments to initialization logic