Compilation Adjustments

To make it easier to compile on the Shared RRC Computer.