Corrections pass for all in one setup script