fix overlays and .mk files