Further fixes, trying to get to green.