Fix handling of default tips