Fixes to Galaxy components discovered when backporting changes.