Fixed some checks...