Minor update, clear warnings