Some amount of fixes.