More fixes trying to make Maruku happy.