More gee_spr changes

Change-Id: I56342ec0c44da033126824ddb812c4a1e64f9179