Various component changes that have been hiding on my thinkpad.