Some links enhancements