Warnings fixed, initializers shuffled, but missing initializers