Improve checks in bin/setup