Eluna misc fixes