More fixes

Okay, that aught to do it this time.