Fixes and changes to local.conf