Fixade warnings