Fixes for Active Display commits