more gsp fixes