Start restoring debug menu functionality

Fix bug with delegate set accessor