Fixes several issues when checking for expired tips