Add some fixes.