Fixing some routing issues surrounding sensors