fix some issues with remote build machines