Changed some checks that I forgot