Fix setup errors