overlay: update and fix various configurations