Compilation fixes that didn't make the last push