Small tweaks to operational setup for portability