Port fixes from e623c302d5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
e623c302d5