Fixed linking issues with remote machines