Fixed typo / extra popd in setup scripts