Leftovers left on the hotplate.

Couple more things for widescale upgrade.