Fix overlay inclusion order