Some fixes (Still all UNTESTED)