Additional setup changes (very incremental)