Fix for everything that isn't desktop Aurora