Merge in fixes to galaxy components from @kellrott.