More bootstrapping and better checks