Some fixes. More coming