Updated for djm34's lyra2re improvements