Misc fixes for HarmonyViewer integration.