Adjusted default assignments to avoid notices