Additional configurations based off work on Windows