Nautilus overlay: minor cleanups