Fixed RA_STAR build issues

Needs testing