Eluna fix declarations