#1 Fix building issues on some systems

There might still be an issue with building the tests, but the standard user probably won't need to build those for now.

Manually merged, because there was some problem, and thanks ;)