Merged changes from AFRL SORCER - minor changes for compat with modeling