Adjust SIGTERM and SIGINT location, fix config