New fixes and untested changes