Fixes of fixes