Quick upcoming interfaces fix and None fix