Fixes for master rerun