Improved visibility checks