Improve checks