A couple of GSI related bug fixes