Fixes so that code compiles on SAS hardware