merged fixes back in