Eluna Fix few methods