PedroAlvesV Minor fixes (assertions additions)