Additional fixes for 'GLib-CRITICAL: Source ID was not found when attempting to remove it' messages