Minor tweaks
Partially reverting 8d084ef0fba6acbee538a7dd03d1e6de6fc3f0b5, fixes linker problems with one of the tests