Switches: fixes from ipmanager
oops: path