Minor changes to get things at least off the ground again.