[MoonWarriorsAM] Fix issues