Better logging and link detection