Some fixes

Blargh.