fixes statpanel by porting #66971 and #63991 from tg#350

manofpepsi wants to merge 1 commit intoAetherStation:masterAetherStation/AetherStation13:masterfrom

manofpepsi:mastermanofpepsi/AetherStation13:masterCopy head branch name to clipboard