Fixed fixes