More fixes

Updated