Fix up init