Small fixes in variable substitution for control extra and configuration files