fix compile errors
fix compile errors

098d3f64869433dcc6790cdad7628491af8097d6 merged in changes to a struct that
caused compile errors in this branch

rhansen/rpstir,rhansen/rpstir,rhansen/rpstir,rhansen/rpstir,rhansen/rpstir