Fixed some dumb checks