Small changes with checking some stuff