Add missing initializers, fix bitmasks