Improvements into type checks