Eluna fix some methods