Some fixes. More coming.