Some adoptions to make the app run again