Minor fixes
Merge remote-tracking branch 'origin/networkmanager' into networkmanager