Build longrun fixes