Fixes that are not directly TSS-related.