Couple more fixes. Almost there.