Minor GSP cleanup