Eluna method fixes