Eluna: Fix issues with SD2 compatibility