Fixed Linux Build for new setup