Few changes from archi.local