System config fixes

This addresses a number of issues: #112, #113, #241, #246.