* Changed some files/link erros

* Fixed link errors on mac