Minor updates to make building .exe with pyinstaller easier