rollup of fixes