some fixes.