Pull some stuff from N6-Dev-Team.