Portion of fixes