Add missing things about Active Display and fix build