Use correct element paths and workaround vim bug