Compilation Adjustments

To make it easier to compile on the shared RRC PC.