Removed more platform dependent paths.