Just some fixes.