Don't replace the global Promise & improve logging slightly