gs minor fixes