merged fixes