Fix link errors on Linux
Minor fixes