Fix check issues