Some fixes. More to come!