Fixing setup steps