Fix warning and move to public some function