Hopefully fixed random build fails