Fruits of a debug session: repairing works.

Just some little odds and ends that needed updating, nothing special.