New fixes

New fixes