Fix up setup